Revision: baz--resolve--1.2--patch-6
Archive: jblack@gnuarch.org--2004
Creator: James Blackwell <jblack@canonical.com>
Date: Sun Jan 30 23:02:28 EST 2005
Standard-date: 2005-01-31 04:02:28 GMT
Modified-files: tests/test-merge.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-6
Summary: Fixing merge test I broke
Keywords: 

